Merge "Settings: Change array resource sim_color_light to an integer array" am: ed0f3c60 am: 1ab90f46

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2081598



Change-Id: Id9745becd41d7b74946bc57d07402e7c503dd9cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>