Merge changes from topic "tc_change_23050307_55" into tm-qpr-dev-plus-aosp am: 7550aa52 am: 27ac0f8d

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



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