Merge changes from topic "am-a9e26c3082994f7bbaad0b98192988d9" into tm-qpr-dev-plus-aosp am: a098b3af

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



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