Merge "address API council feedbacks for Telephony.Carriers" am: 310b9ea8d5
am: b78f02e157

Change-Id: I0daca5a31683cd9889e724b99d3c1cc6cdec38ca