Merge changes from topic "am-33955e9c70784617ba9185fd3fa3dfcc" into...

Merge changes from topic "am-33955e9c70784617ba9185fd3fa3dfcc" into tm-qpr-dev-plus-aosp am: 16e6e0b0

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



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