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

Change-Id: I9075980c4bdc2632a0a433493085c15f94a1a99e