Merge changes from topic "tc_change_23050307_29" into udc-dev am: ed2b780f

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



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