Merge "Refactor BluetoothAdapter APIs used by Settings" am: 8ab35ca19d
am: 5414c1705e

Change-Id: Ib1042fbceafe30ce07537e9fc7f9d918139188e7