Merge "hwservicemanager: read random bytes from /dev/urandom" am: 3cbeef8bd8
am: 9794e384fd

Change-Id: I584092d3ba9e1635e2e878c63bf4416f31dc2b30