Merge "Stop manually mixing /dev/hw_random." am: 220091e16f am: 9990c39494

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib47bd8a26922cfb8794e7d6da91b96bc72b14e60