Merge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key." am: ded8a6b7f6
am: c86e5802c6

Change-Id: I9ea249ed0837c8501f62154bec5c36d47a0e67e0