Merge "Improve UI for PIN2/PUK2 authentication on FDN setting" am: 229d0469f8 am: f23f8cebfa

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

Change-Id: I16d6fbcdbdadb840304ba897dba5c59a3521d2aa