[automerger skipped] Merge "Don't backup/restore sim-settings if Telephony not present." am: d50bb50f91 am: 68e5bb5582 am: 97882604f2 -s ours

am skip reason: skip tag Change-Id Id898d135ed64a704cc4707dcb796664d9b08264b with SHA-1 55fba4d55f is already in history

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

Change-Id: Ic2b923d358fe9f453c1da93dcdc79d892292853c