Merge "Use SecureRandom instead of java.util.Random." am: 415be6e357 am: 69cb81929d am: 558957b134

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

Change-Id: I93c71101edee52fcc6945508ff7c022e583e83e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>