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

[automerger skipped] Merge "[Settings][port] configuration for hidding SIM related UI" am: 66850554 -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: I6c76e1df48a75f49d99beb22eaff8109de6cc676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>