[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L70400000959336902:N98400001351009104" into udc-dev am: d3e4e173 -s ours

am skip reason: Merged-In Ica31ffcc22d5a75aa82b9e2f91b9239d63506a40 with SHA-1 c5a164cf is already in history

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



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