[automerger skipped] Merge "address API council feedbacks for Telephony.Carriers" am: 310b9ea8d5 am: b78f02e157
am: eff2277802  -s ours

Change-Id: Ib3adfb595b41ed2a01d7d11395cdbe1b4f099b08