[automerger skipped] Merge "[Settings][Back port] configuration for hidding...

[automerger skipped] Merge "[Settings][Back port] configuration for hidding SIM lock UI" into tm-qpr-dev-plus-aosp am: 4c06b549 -s ours

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

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



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