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