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