Merge "Update Bluetooth api on SettingsLib" am: bdc1390f27 am: 37f2296023

Change-Id: Iac44853515c9c1fc86d2dbc03b76804c3c439d5d