[automerger skipped] Merge "[Settings][port] configuration for hidding SIM related UI" am: 6685055435
-s ours am: b02050cbe1
-s ours
am skip reason: Merged-In Ie61557590cdc15e2d03b1e71bbc78def2c60046a with SHA-1 de01ab40a5
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2317315
Change-Id: Ib15bf621b3d56568377641574cf42bb6dee6bffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: