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

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



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