Merge "Merge "Migrating frameworks/base BT files" am: 070f2b05 am: 6d8e9705" into sc-qpr1-dev-plus-aosp