Merge changes from topic "am-9b881f1c9bc845ce946c4f8ffeda0ee3" into udc-dev am: 8f97e4cf

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



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