[automerger skipped] Merge changes...

[automerger skipped] Merge changes I0370ed2e,I976a5a6d,If1f7c927,I10fcc2dc,Idef4ea28 into udc-qpr-dev-plus-aosp am: 0bcc0ca3 -s ours

am skip reason: Merged-In I0370ed2e3166d56f708e1981c2126526e1db9eaa with SHA-1 6cf5b048 is already in history

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



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