Revert "Catch KeyStoreException for setting profile lock" am: e61672ab08
am: fe3b0b2cc1

Change-Id: Iba7288ba01872f804a22814f4615b202010d7194