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

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

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