Merge tag 'android-16.0.0_r1' of https://android.googlesource.com/platform/packages/apps/Settings into HEAD

Android 16.0.0 release 1

Change-Id: Ic78040624e22096851aac16482cb2915ec64c0ed