Merge "address API council feedbacks for Telephony.Carriers"
am: 71f9fe4dfa

Change-Id: I834e4f1fe9457af586a0fe7856c4ab351a4b26a3