[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-3fef827196ce4817b8e87d149877ae6e" into udc-dev am: 6054151b -s ours am: 7cf1d6df -s ours

am skip reason: Merged-In I27be1f93598820a0f2a7154ba83f5b041878c21f with SHA-1 d6e9fdf1 is already in history

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



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