Merge "[Settings][Back port] configuration for hidding SIM lock UI" into...

Merge "[Settings][Back port] configuration for hidding SIM lock UI" into tm-qpr-dev am: af96b1ea am: 59969d6a

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



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