Merge changes from topic "am-506915328cc748ed9289a76dfa6d4efd" into...

Merge changes from topic "am-506915328cc748ed9289a76dfa6d4efd" into tm-qpr-dev-plus-aosp am: ab254bb6

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



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