[automerger skipped] [Settings][port] configuration for hidding SIM related UI...

[automerger skipped] [Settings][port] configuration for hidding SIM related UI am: b644c542 -s ours am: f10535cf -s ours

am skip reason: Merged-In Ie61557590cdc15e2d03b1e71bbc78def2c60046a with SHA-1 de01ab40 is already in history

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



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