Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev