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

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

Change-Id: I7adb58e74b836ad4989e9914aa3f5a7dbba3acb8