[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L06300000960575919:N80300001367524183" into udc-dev am: 36847cf6 -s ours

am skip reason: Merged-In I61c6eb5bd72ba6c3dac1186de1b893e5b461e368 with SHA-1 ddb86a18 is already in history

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



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