[automerger skipped] Merge "address API council feedbacks for Telephony.Carriers" am: 310b9ea8 am: b78f02e1 am: eff22778 -s ours Change-Id: Ib3adfb595b41ed2a01d7d11395cdbe1b4f099b08