Merge changes from topic "am-a3f3fd8280ee43eb98a3626c1dd80e26" into udc-dev am: b9d9c73f am: b4ae76f6

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



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