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

Change-Id: Ib443a1fea735b8aa240d724fc7a24c91102440ef