[automerger skipped] Merge "[Telephony Mainline] Move carrier id proto to TelephonyProvider" am: b94c6d18aa am: 1fbfeda500 -s ours
am skip reason: Change-Id I4f9cf0d7d899fdfe64858d0ca19cbe350516a8fd with SHA-1 e9b03419e3 is in history

Change-Id: I41906cfffa4599b8733ac3fdd51b8d54304ea7aa