Merge "Merge "Add API setAllowedCarriers, getAllowedCarriers to...
Merge "Merge "Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager" into nyc-mr1-dev am: ac517216" into nyc-mr1-dev-plus-aosp
am: f71eae26
* commit 'f71eae26':
Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager
Change-Id: Ie2ffd247f9803b822c9cdd4080edfcfe6a18e9b9