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