[automerger skipped] Merge "address API council feedbacks for Telephony.Carriers" am: 5e2a561486 am: 7167a90f7e
am: 73132f79ed  -s ours

Change-Id: I9b4ee0500c564ef1a9f3b9e985308915ede9e8eb