Merge "Add feature flag for TelephonyManager#get/setAllowedCarriers" am: c4fc77792c am: 969f4742f4 am: 1b11e44b94
am: 3b16cc25fd

Change-Id: Ic6c5756c217273b31dc2c5770f30da133a84a7e4