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

Android 5.1.0 release 3

Change-Id: I8e5e23416b0becc5bacba0d5f55e7eb787608a10