Merge "Add ANR info to traces for all builds" into tm-dev am: a2b0efdc12 am: be4364610b

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

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

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

@@ -16,7 +16,6 @@
 
 package com.android.server.am;
 
-import android.os.Build;
 import android.os.Trace;
 
 import java.util.UUID;
@@ -31,7 +30,7 @@ public class TraceErrorLogger {
     private static final int PLACEHOLDER_VALUE = 1;
 
     public boolean isAddErrorIdEnabled() {
-        return Build.IS_DEBUGGABLE;
+        return true;
     }
 
     /**