[automerger skipped] Merge "Migrate Sim-inserted restore flow to begin after...

[automerger skipped] Merge "Migrate Sim-inserted restore flow to begin after carrier config update." am: ed644327 am: 8d1d550e am: 31b1b1c7 -s ours am: 105c9007 -s ours am: d0f75ba5 -s ours

am skip reason: Merged-In I33468d462f30b4583ec486b6e4a33d1818125e6f with SHA-1 5ea07410 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1691365

Change-Id: I23e2943484495282b997df7f0d55e820d5203d7a