[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L26800000959639523:N98700001354966723" into udc-dev am: 2eaaea23 -s ours

am skip reason: Merged-In I4b213e99ff8a77801aa4f79f741add25176c9ff4 with SHA-1 5ea1c526 is already in history

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



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