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

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

Change-Id: I635fe34f424b82356406cb95d40839f256d28323