Merge changes I8bb56554,I2e88997a

* changes:
  Dump some extra information from LockSettingsService
  Clean up exception usage in LockSettingsService (part 2)