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

[automerger skipped] Merge "[Settings] configuration for hidding SIM provider UI" am: f7ec7e66 am: f901e617 am: 3150fa81 -s ours

am skip reason: Merged-In I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b with SHA-1 2f07595e is already in history

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



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