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

Change-Id: Ied26a01c8b70c897fe5cb775436447620d1baa97