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

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

Change-Id: I57a5d8949efaff467ff0ee71fea007521d3cdb07