Merge "Remove isUnsafeBuild() from IpSecAlgorithm" am: ed3a5226ed am: db38285cf8 am: 4886dddd43

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

Change-Id: I5b6315902921bdaaa3d5de701acab6250742ddf4

framework-t/src/android/net/IpSecAlgorithm.java

@@ -469,20 +469,12 @@ public final class IpSecAlgorithm implements Parcelable {
         }
     }
 
-    // Because encryption keys are sensitive and userdebug builds are used by large user pools
-    // such as beta testers, we only allow sensitive info such as keys on eng builds.
-    private static boolean isUnsafeBuild() {
-        return Build.IS_DEBUGGABLE && Build.IS_ENG;
-    }
-
     @Override
     @NonNull
     public String toString() {
         return new StringBuilder()
                 .append("{mName=")
                 .append(mName)
-                .append(", mKey=")
-                .append(isUnsafeBuild() ? HexDump.toHexString(mKey) : "<hidden>")
                 .append(", mTruncLenBits=")
                 .append(mTruncLenBits)
                 .append("}")