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

Change-Id: Iccd038091c5472e60eadb4f79928a3df74c8c351