Merge "Verify kernel implementation of ChaCha20Poly1305" am: 69c14d531c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503694

Change-Id: Ibcb5a3ace65e96497bc969f85c0febff32d80fec