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

Change-Id: Icdfe48f60dbdf88b49e49c59f7136eae34b0dec2