Merge "Redact key value from log when DEBUG is false" am: 17a7d79ff4 am: 694cf0f6af

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

Change-Id: I501853427878fa4ea0e227ec1b00ac7c831b5291

core/java/android/util/ArrayMap.java

@@ -646,7 +646,7 @@ public final class ArrayMap<K, V> implements Map<K, V> {
             e.fillInStackTrace();
             Log.w(TAG, "New hash " + hash
                     + " is before end of array hash " + mHashes[index-1]
-                    + " at index " + index + " key " + key, e);
+                    + " at index " + index + (DEBUG ? " key " + key : ""), e);
             put(key, value);
             return;
         }