[automerger skipped] Merge "address API council feedbacks for Telephony.Carriers" am: 71f9fe4dfa am: 1bf36a6a72
am: 62dc239377  -s ours

Change-Id: I531e7043cb7a385893ede9b27f25f7eabc6bca8a