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

Android 4.3 Release 3.1

Change-Id: I774916f77f3cbb3fc20404a1572799fb28c38b10