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

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

Change-Id: Ie93e593bd697c8f36c825c8da45f2dcf4c60db40