[automerger skipped] Merge "[Telephony Mainline] Remove carrier id proto from...
[automerger skipped] Merge "[Telephony Mainline] Remove carrier id proto from framework/opt/telephony" am: 0603a677 am: 8d10422d -s ours
am skip reason: Change-Id I8a39e7a90df0cda92d959030fd010fac310ef683 with SHA-1 fad698e2 is in history
Change-Id: Iccefd7951a3954ca76b2b38a2c5d3fc91dce2687