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

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

Change-Id: I0b6c829078415f9b5c1a75ece580583ff7a1bb46