Android Mainline 12.0.0 Release 49 (7914710,com.google.android.networkstack)
[automerger skipped] Mark ab/7061308 as merged in stage. am: 04b7c3ad1f -s ours am: 10820fb3bb -s ours am: 977d20636d -s ours

am skip reason: Change-Id Ib1f4f7a64d45ceff6b55a277af0cdd8dc883026d with SHA-1 f13ad4bb8b is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I21bae50ec324dcfeac000f571da712467039f5dc