Catch KeyStoreException for setting profile lock am: c8fa5ed8f2
am: 3b546019dc

Change-Id: Id668766a96473ae2f68e83dae1ecb547b26de6fc