[automerger skipped] Merge "Correctly support restoring SIM specific settings"...

[automerger skipped] Merge "Correctly support restoring SIM specific settings" into main am: 98811d90 am: d0c6c899 -s ours am: 323d2409 -s ours

am skip reason: Merged-In I2f8cb6418ee661a3cd8c02e3db6733cb12817d01 with SHA-1 66b2b6c4 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2678041



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