Merge "Make TelephonyManager#get/setAllowedCarriers system api"
am: 6d064d8780

Change-Id: I8f9b1c8e9ce1fda6cd03cd0dd459ead8837bd90d