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

Change-Id: I48e700aa8833ddd237e633b76eb755a61a1c4f09