Merge changes from topic "am-3f5f23a59d06436b86fe291170ec2afc" into...

Merge changes from topic "am-3f5f23a59d06436b86fe291170ec2afc" into tm-qpr-dev-plus-aosp am: f72ae8a3 -s ours

am skip reason: Merged-In I77f5e61be5162e6539b47823512f4537fedec392 with SHA-1 e94f3e08 is already in history

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



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