Merge changes from topic "screen_lock_settings_log"

* changes:
  Remove broken tests
  Log screen lock settings using its own constant

src/com/android/settings/security/screenlock/ScreenLockSettings.java

@@ -46,7 +46,7 @@ public class ScreenLockSettings extends DashboardFragment
 
     @Override
     public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.SECURITY;
+        return MetricsProto.MetricsEvent.SCREEN_LOCK_SETTINGS;
     }
 
     @Override