[automerger skipped] Merge "Merge "Migrating frameworks/base BT files" am:...

[automerger skipped] Merge "Merge "Migrating frameworks/base BT files" am: 070f2b05 am: 6d8e9705" into sc-qpr1-dev-plus-aosp am: d4b3e9df -s ours am: 83a20566 -s ours

am skip reason: Merged-In Idb55371e9d678296fe46e5f4231ec2d12ec8b978 with SHA-1 fbfd4e47 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16666711

Change-Id: Ibc35b8edeba0b9962f51938b43446777b555015c