Android Mainline 12.0.0 Release 49 (7914710,com.google.android.networkstack)
[automerger skipped] Mark ab/7061308 as merged in stage. am: 77b26c3be8 -s ours am: 8121f60aec -s ours am: 480c76b27b -s ours

am skip reason: Change-Id If3eeb5f43ea6e9adf9e1d9d1d7e199c01ec4f1b5 with SHA-1 9aaad515f8 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I135deb8d1b93d03f7865d052e85e2376897c5b84