Merge changes from topic "tc_change_23050307_56" into tm-qpr-dev-plus-aosp am: d618132e

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



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