Merge changes from topic "am-0c01a138cd7c4b1ab98ea27ddf306450" into...

Merge changes from topic "am-0c01a138cd7c4b1ab98ea27ddf306450" into tm-qpr-dev-plus-aosp am: 1b02df5e -s ours

am skip reason: Merged-In I11c901da07a9ca6423942cd1702f00d557f1d0b6 with SHA-1 e760de0c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/18756101



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