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 am: d6db45bf

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



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