Revert "Catch KeyStoreException for setting profile lock" am: e61672ab am: fe3b0b2c am: f516131a am: af98d20d Change-Id: Ib443a1fea735b8aa240d724fc7a24c91102440ef