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

Change-Id: Ic45b11120553e256ccc774307a108b94aafbabcc