Merge "bluetooth: disable BLE_VND_INCLUDED" am: 454721f93e am: ba471ce883

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

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