Merge "Remove usage of Math.randomLongInternal" am: c931f43bcd am: 267fc8b764

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

Change-Id: I8492bed0324d81efdadeb29ae8abb7d36956d6cd