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

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



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