Merge "Update Bluetooth api on SettingsLib"
am: bdc1390f27

Change-Id: Ib04fc9b6a3decd9a7805b3bd60a399b792551526