Merge "Don't send more than 2K to addRngEntropy" into oreo-vts-dev
am: b461eafa23  -s ours

Change-Id: I0132541fbbd292f1c0c8e4d4461671b3c7983f39