Merge "ContactsProvider does not use cleartext network traffic." into mnc-dev