Merge "Merge "Change Bluetooth apex mountpoint" into tm-dev am: 7a1c7017 am: 183bba21" into tm-d1-dev-plus-aosp am: 7c1377ce

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19038084



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