Merge changes from topic "tc_change_23042206_48" into udc-dev am: ce7825aa

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



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