Merge changes from topic "tc_change_23041807_35" into tm-qpr-dev-plus-aosp am: a1a44a69 am: 62982042

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



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