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

[automerger skipped] Merge "Migrating frameworks/base BT files" into sc-v2-dev-plus-aosp am: d1826ce0 -s ours

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

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

Change-Id: I8a2ebdd15d1ddffa5bf8968a79789ddb95e7b41f