Merge "Copy predump file's output in case of timeout" into udc-dev am: d2829c9c64 am: de19a08693

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23662185

Change-Id: I36573c88149e9ef347ef2da21ac4faa22db920d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/java/com/android/server/am/StackTracesDumpHelper.java

@@ -392,11 +392,9 @@ public class StackTracesDumpHelper {
             if (TEMP_DUMP_TIME_LIMIT <= timeTaken) {
                 Slog.e(TAG, "Aborted stack trace dump (current primary pid=" + pid
                         + "); deadline exceeded.");
-                tmpTracesFile.delete();
                 if (latencyTracker != null) {
                     latencyTracker.dumpStackTracesTempFileTimedOut();
                 }
-                return null;
             }
             if (DEBUG_ANR) {
                 Slog.d(TAG, "Done with primary pid " + pid + " in " + timeTaken + "ms"