[automerger skipped] Merge "Update Bluetooth api on SettingsLib" am: bdc1390f27 am: 37f2296023 am: 1c20fed67e -s ours
am skip reason: Change-Id I2d7438d48acde155e2b411fd98cb59961c8d75c1 with SHA-1 19466b7428 is in history

Change-Id: I3fb949826ca93ba0fe83cbf23243de67699054f8