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

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

Change-Id: I29891ff4ff37e65fae5a8cc559325d9777aaf754