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

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



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