Merge "Remove usage of Math.randomLongInternal" am: 17d5075af4 am: 076022aa98

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

Change-Id: I52e45500d6ceaead1cd068fb639e8c2d74d55d3e

services/core/java/com/android/server/pm/PackageDexOptimizer.java

@@ -80,6 +80,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 
 /**
  * Helper class for running dexopt command on packages.
@@ -104,6 +105,8 @@ public class PackageDexOptimizer {
 
     private final ArtStatsLogger mArtStatsLogger = new ArtStatsLogger();
 
+    private static final Random sRandom = new Random();
+
     PackageDexOptimizer(Installer installer, Object installLock, Context context,
             String wakeLockTag) {
         this.mInstaller = installer;
@@ -262,7 +265,7 @@ public class PackageDexOptimizer {
                 if (packageStats != null) {
                     Trace.traceBegin(Trace.TRACE_TAG_PACKAGE_MANAGER, "dex2oat-metrics");
                     try {
-                        long sessionId = Math.randomLongInternal();
+                        long sessionId = sRandom.nextLong();
                         ArtStatsLogUtils.writeStatsLog(
                                 mArtStatsLogger,
                                 sessionId,