Merge changes from topic "tc_change_23041807_35" into tm-qpr-dev-plus-aosp am: d418c732 am: 6cd3dc1b

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



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