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

Change-Id: I8158dc47258f7415793a00b00835ffc5d3adaa1a