Merge "bluetooth: disable BLE_VND_INCLUDED" am: 454721f93e

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/2116500

Change-Id: Idc9d358284a370d2532a328f7a80a154f96b3e3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>