[automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891"...

[automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: b4bc86b5 -s ours am: 81f53d81 -s ours

am skip reason: Merged-In I4e58fde49b404c9fcf36b30d72214bd8787dd71e with SHA-1 e9ce61ec is already in history

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

Change-Id: Ib0fe0093f02c082168fc5d6e2360f58e36e76fca