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

Change-Id: I71ce6acd1922221774954089db25bcdf9f393f80