Merge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev am: d427da8a am: 466bb400 am: 52a35420 Change-Id: Ifa7aead1d53406409e5301724f44f8d7309e8911