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

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

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