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

Change-Id: Ie1a720181bf542bbf213af8b6b83eff0ecd84a98