[automerger skipped] Merge "[Settings] configuration for hidding SIM lock UI"...

[automerger skipped] Merge "[Settings] configuration for hidding SIM lock UI" am: 1ab73b93 am: 2a98e2a4 am: aa7fcd1c -s ours

am skip reason: Merged-In I870c0b53112db56b7bc80bfd585f6f7b3cf82737 with SHA-1 7c3f04aa is already in history

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



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