[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L30500000959728347:N31100001356091350" into udc-dev am: dbff085b -s ours am: 6155ef28 -s ours

am skip reason: Merged-In I4b0aecd3622f1c6828c04bc1432a13cbda6a6c61 with SHA-1 3307b8e1 is already in history

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



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