Merge "[Settings] configuration for hidding SIM lock UI" am: 1ab73b934b am: 2a98e2a4fe

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

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