Merge "Test for patchlevels and too much entropy" am: b5ee70f125 am: fac02e6354 am: e89f9b8e30 am: 8f7c7527a4 am: 6fb7a57cf9 am: addc2d2cc7

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1673208

Change-Id: Ie89d945d1733d0ca13ad0cd97058e42e0d3654c1