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

Change-Id: I2f6d45fcb3d5c32b15722e37bd25d9c3a2f81dc5