[automerger skipped] Merge "API changes requires for Bluetooth apk inside the...

[automerger skipped] Merge "API changes requires for Bluetooth apk inside the apex to build." am: 6f631e80 am: b92199c7 -s ours am: 83ace65d -s ours am: 66c9377c -s ours am: d42e39be -s ours

am skip reason: Merged-In Ic8e9c2db0743738b2b6649451c79a559c3b8edc5 with SHA-1 afa544dd is already in history

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



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