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

Change-Id: I11d3c501cd623f669433a91869bbc3604743abf4