Android Mainline 12.0.0 Release 122 (8559627,com.google.android.networkstack)
[automerger skipped] Mark ab/7061308 as merged in stage. am: 46790d2eae -s ours am: 9d61b0639d -s ours am: 31c016a05b -s ours

am skip reason: Change-Id I40c39bf719309394597f6f9c0b93e39921039103 with SHA-1 f0deaf70cb is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36e8d2f50114acf0529f814568a87b0167fc36e6