Merge "Displaying SIM info on de-perso Lock UI" am: 817a9c7b3d am: c6999d5883 am: 15420b10e5 am: d62ec462d2 am: f94cd8520a

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

Change-Id: I5d2a900bc6c4bd800846296ba1a08d88cf147c27