[automerger skipped] Verify kernel implementation of ChaCha20Poly1305 am: 09527d67ca -s ours am: f9b6e17eed -s ours

am skip reason: Merged-In Ia29540c7fd6848a89bfa2d25c6a87921e45d98da with SHA-1 80be81b302 is already in history

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

Change-Id: Idfdeb7d46264f5bd5cea170433565aee71a50a8d