Merge changes from topic "am-bfee83ed80e040c18ec82f23167a587c" into...

Merge changes from topic "am-bfee83ed80e040c18ec82f23167a587c" into tm-qpr-dev-plus-aosp am: 3e1232d2

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



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