Merge changes from topic "tc_change_2305100725_23" into udc-dev am: 998a5829

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



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