Merge "Fix the PIN2 input screen remains while deleting FDN" am: ed85c7d201 am: 4f36cbfa3a am: d6ace8a203 am: e794052511

Change-Id: I6a593cfab64d81bd7f0bb2b6b54d95c6ae4a4265