[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: 960aea29 -s ours
am skip reason: change_id I8a39e7a90df0cda92d959030fd010fac310ef683 with SHA1 51f8cabb is in history
Change-Id: Ic4d4308481b256d7a4d0b9fb02e59509c34d237e