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

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



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