Android Mainline 12.0.0 Release 122 (8559627,com.google.android.networkstack)
[automerger skipped] Mark ab/7061308 as merged in stage. am: 3881c145da -s ours am: 4906db6ae5 -s ours am: af4fb9fa8f -s ours

am skip reason: Change-Id I395973694367a1ab04cf8b3c3a3a3df5ac63cd52 with SHA-1 825f8f52c4 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff0885aad039143a367091bb18bbdfce002d22ed