[automerger skipped] Merge changes from topic "migrate-aosp-bt" am: a1aa6390...

[automerger skipped] Merge changes from topic "migrate-aosp-bt" am: a1aa6390 am: 726224a8 am: a0e44756 -s ours am: a3d548ee -s ours

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

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

Change-Id: Ied734de68ae469a04dcf79d845af47b78a1df761