Merge "Fix dump() without ACCESS_KEYGUARD_SECURE_STORAGE" into udc-dev

services/core/java/com/android/server/locksettings/LockSettingsService.java

@@ -3101,6 +3101,16 @@ public class LockSettingsService extends ILockSettings.Stub {
     @Override
     protected void dump(FileDescriptor fd, PrintWriter printWriter, String[] args) {
         if (!DumpUtils.checkDumpPermission(mContext, TAG, printWriter)) return;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            dumpInternal(printWriter);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    private void dumpInternal(PrintWriter printWriter) {
         IndentingPrintWriter pw = new IndentingPrintWriter(printWriter, "  ");
 
         pw.println("Current lock settings service state:");