Merge changes from topic "am-59ffd71f8b3a437b97b183646fbc764c" into...

Merge changes from topic "am-59ffd71f8b3a437b97b183646fbc764c" into tm-qpr-dev-plus-aosp am: c7a1cfc7 -s ours

am skip reason: Merged-In I5086ad669df914cfbe3f2a0f7c5e3100c6aaee7a with SHA-1 476f0434 is already in history

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



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