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

am skip reason: Merged-In Ia29540c7fd6848a89bfa2d25c6a87921e45d98da with SHA-1 09527d67ca is already in history

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

Change-Id: Ie6731fdecde14a72141258aed375c42a8b0229a4