[automerger skipped] Merge "Change KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL to public" am: 936fd348f7 am: c478e51e9b
am: 686df58861 -s ours
am skip reason: change_id I9e214607d4b791f11c8b688268fa1d58d66c23fc with SHA1 48ae8d52c3 is in history

Change-Id: If556cadd0fc5495f6343f7f6d0c5267d48c98ebc