[automerger skipped] Revert "[Settings] configuration for hidding SIM lock UI" am: ead8a35720
am: 2decf2ae45
am: 52bae42964
-s ours
am skip reason: Merged-In I870c0b53112db56b7bc80bfd585f6f7b3cf82737 with SHA-1 7c3f04aa11
is already in history. Merged-In was found from reverted change.
Reverted change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299463
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310156
Change-Id: I0e4421e7756b659f0453f0342fc5b8b158c630af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: