[automerger skipped] Merge "Trigger per-sim configs restore when sim...

[automerger skipped] Merge "Trigger per-sim configs restore when sim inserted." am: 6083c272 am: c731ba10 am: 50f09332 -s ours am: f03719e3 -s ours am: 66ae6364 -s ours

am skip reason: Merged-In Ifc69e7e75e20554f3b2816b137dfec9fb83af92f with SHA-1 fc46c093 is already in history

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

Change-Id: I69772dc401c5c53db981766100d302f900e01e58