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

Change-Id: Ica7d8825fb973e288270e21345066a675818836e