Merge "Settings UI fix for missing secure lock screen feature."

tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java

@@ -31,6 +31,11 @@ public class ShadowLockPatternUtils {
 
     private static boolean sDeviceEncryptionEnabled;
 
+    @Implementation
+    protected boolean hasSecureLockScreen() {
+        return true;
+    }
+
     @Implementation
     protected boolean isSecure(int id) {
         return true;