Changes for STE AOSP bluetooth
Merge branch 'master' of https://github.com/AOSB/android_packages_apps_Settings