Merge "Add feature flag for TelephonyManager#get/setAllowedCarriers"
am: c4fc77792c

Change-Id: I4368431b3537bde427d8bb68f33fc8b6cf876f15