[automerger skipped] Merge changes from topic "presubmit-am-f7a73997089946b394bc53cf315fa11a" into udc-dev am: 7fd82469 -s ours

am skip reason: Merged-In I4c307f53a1346836cb228c0018f9720472cfbeeb with SHA-1 3bc96838 is already in history

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



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