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

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

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