Merge changes from topic "tc_change_23050307_28" into udc-dev am: 047a3a79 am: 48aaf2f3

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



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