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

Change-Id: I9775826417d2df6284bf0273b48c3a9814a01cf4