Merge "address API council feedbacks for Telephony.Carriers" am: 5e2a561486
am: 7167a90f7e

Change-Id: Id3c296fd9097b6a14b49788d186e806a72d26084