tree 063424b3d45c38b42deee6b3ed73bd395fe8c759
parent 998d79fb22fca25534dd52b83ecc138c116abea1
parent 36356a71732efb1dc73814e59ce6eb6ff1bfe1c8
author Jack Nudelman <jacknudelman@google.com> 1619214429 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619214429 +0000

[automerger skipped] Merge "Create APIs to properly backup and restore per-sim configs." am: a737a46e04 am: bb230922a0 am: 36356a7173 -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: Ia18a10445d2b2b71f5a92d36b04427309b2b15ec