Merge "Convert LockSettingsService tests to JUnit4"
am: 78056c77f3

Change-Id: Ia3e6556eaebc346434abc84ee9d76287f77a7130