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

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

Change-Id: Icdc72635d0c035e7694d2d4d32b6f92b87fe1796