[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-d5c371a423aa44e7b544e07c8f4b49b2" into udc-dev am: 97f2164e -s ours

am skip reason: Merged-In Ib242d348a845f05a56edf45101e1b5d6ed291893 with SHA-1 45151b4a is already in history

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



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