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

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



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