[automerger skipped] Merge "Create APIs to properly backup and restore per-sim configs." am: a737a46e04 am: bb230922a0 am: 36356a7173 -s ours am: 808100acb4 -s ours

am skip reason: skip tag Change-Id I39d31f4b753b924bc6773978546388d546be54b2 with SHA-1 c90b38b378 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1685305

Change-Id: Id8bcd8580575ffd1ad65bc6805c2f3d79ffaa52e