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