Merge changes from topic "am-414a94947bed43e6a84cfcb1fa2914a3" into...

Merge changes from topic "am-414a94947bed43e6a84cfcb1fa2914a3" into tm-qpr-dev-plus-aosp am: b97e9f62

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



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