Merge "Don't set /dev/hwrng to O_NONBLOCK" am: 94ad8ad990 am: e1b4ac967b

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2480515

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