Merge tag 'android-6.0.1_r66' into HEAD

Android 6.0.1 release 66

# gpg: Signature made Tue 06 Sep 2016 09:27:08 AM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found

diff --cc src/com/android/settings/SettingsActivity.java
Simple merge

diff --cc src/com/android/settings/users/UserSettings.java
Simple merge