Merge tag 'android-4.2.2_r1.2' of https://android.googlesource.com/platform/packages/apps/Contacts into cm-10.1

Android 4.2.2 release 1.2

Change-Id: Ieef9f5556c509b8d0a0520def648387d4adafe6b