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

Change-Id: I7e755924f2a3e1556fcdc47068c0a863276ce984