Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/providers/ContactsProvider into 1.1

Android 4.2.2 release 1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1