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

Change-Id: Ib85fecb62d22009b2b6c03ec694b79e3f168619d