[automerger skipped] Merge "[Telephony Mainline] Move carrier id proto to TelephonyProvider"
am: 564d6734e5 -s ours
am skip reason: change_id I4f9cf0d7d899fdfe64858d0ca19cbe350516a8fd with SHA1 7b951d5f5e is in history

Change-Id: Iaa99f59b895cb0ed26257c91e9d65a9b9897cd50