Merge "Make some fields in ContactsContract.QuickContacts public"