[automerger skipped] Merge "[Telephony Mainline] Remove carrier id proto from...
[automerger skipped] Merge "[Telephony Mainline] Remove carrier id proto from framework/opt/telephony"
am: ab7ef30e -s ours
am skip reason: change_id I8a39e7a90df0cda92d959030fd010fac310ef683 with SHA1 51f8cabb is in history
Change-Id: Ic84e3b64697eaf97396cb4dbea94abb8d2ee950f