Merge "Change KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL to public"
am: 936fd348f7

Change-Id: I5e915d62c31a05a4b6d6a1e61df814444e68fb37