Merge "bluetooth: disable BLE_VND_INCLUDED" am: 454721f93e am: ba471ce883 am: 98acb0c36f am: df3751fcc9

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

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