Merge "Convert LockSettingsService tests to JUnit4"