Merge "When SIM card removed, dismiss the de-perso UI" am: 6e55fcd847 am: 2511241f3b am: 5ea831379a

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1355123

Change-Id: I76a5136914b56a6d4e516a1ea7537133a1657f0d