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

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

Change-Id: I7143c831b647ea20cec61ff1a01d6129144ea0ee