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

[automerger skipped] Merge "[Settings] configuration for hidding SIM notification UI" am: 56ff3fd9 -s ours am: e1d5ccf7 -s ours

am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde7 is already in history

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



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