Merge "Resolve BluetoothDevice hidden API usages by Settings" am: ce656f7754 am: 10fd57e659

Change-Id: I001128eba5499a0a080707d00c1627335eae7514