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

Android 4.3 Release 3.1

Change-Id: Id1977b9c195196b67cc727b01b2063871308a2a6