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

[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: b357e083 -s ours

am skip reason: Merged-In Ibcc5771571b891b2983fcfba6242e82f50f9017e with SHA-1 1a7fab1d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/15567580

Change-Id: I113d270243abd0aa5c91e1bf860abd5d15c50759