[automerger skipped] Add CarrierConfig to hide "Network default" option in Caller ID setting am: 187c9943ff
am: 7bb40b5909  -s ours

Change-Id: Ib03590cf3a4f0ad0b9b88f7612ac7d6e5ddfbe57