Merge "Use SecureRandom instead of java.util.Random." am: 415be6e3 am: 69cb8192 am: 558957b1 am: 58a3d832 am: f5cb3af4

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



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