Merge "Update Bluetooth api on SettingsLib"