Merge "Merge "EntropyMixerTest: convert to JUnit4" am: 7db3ab2c am:...

Merge "Merge "EntropyMixerTest: convert to JUnit4" am: 7db3ab2c am: 94fe316b" into tm-dev-plus-aosp am: 33f6c910

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



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