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

Change-Id: I6c0408b505b3c9cb0d3a728a2668c9b8c1c5766e