Merge branch 'jb-mr2.0.0-release' of https://android.googlesource.com/platform/packages/apps/Settings into cm-10.2

Change-Id: Ic7f76577ad2c411169c15033d9cb3890b88df255