Merge tag 'android-4.3_r2.2' of https://android.googlesource.com/platform/packages/apps/Settings into cm-10.2

Android 4.3 release 2.2

Change-Id: I6a5876c5af7275a693ea0ccb17e8e64922381754