[automerger skipped] Merge "Call TelephonyProvider apis for backup/restore...

[automerger skipped] Merge "Call TelephonyProvider apis for backup/restore per-sim settings." am: 1f9d1566 am: bbe5473d am: 025822e4 -s ours am: 9c2ddedc -s ours

am skip reason: skip tag Change-Id I1652172f003e2fd5ab08dfdbf63dadc64e034406 with SHA-1 e2ea428d is already in history

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

Change-Id: Ic43fb3adce0bde56245c1707327955d27d2d1985