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

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

Change-Id: If8bc79a6c42071608cb8e3c40a57c9b9963087d1