Merge "Change KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL to public" am: 936fd348f7
am: c478e51e9b

Change-Id: If10fb4a795415bca2a0be8d334ba6e6e738c819a