Merge "[Telephony Mainline] Move carrier id proto to TelephonyProvider" am: b94c6d18aa
am: 7d53a3e9ba

Change-Id: Icd8c356f6f62e7c39b65aa4f4cc56323ba3cec35