[automerger skipped] Merge changes from topic "migrate-sc-bt" into sc-v2-dev-plus-aosp am: d15d8266 -s ours

am skip reason: Merged-In If51a7d232501d15a50e69d25875f0de9df490314 with SHA-1 816d1427 is already in history

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

Change-Id: Ib3239668f3ed8bc89a913a7a6053ea680be57866