[automerger skipped] Merge "Call TelephonyProvider apis for backup/restore per-sim settings." am: 1f9d1566c2 am: bbe5473dff am: 025822e42e -s ours

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

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

Change-Id: I9e1a1a3c8ff1cad7b33e86cf6547d72de7ecdd3f