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

Change-Id: I18b14852bd2281e43ca7b6f6de73903127ee1233