Android Mainline 12.0.0 Release 49 (7914710,com.google.android.networkstack)
[automerger skipped] Mark ab/7061308 as merged in stage. am: 3ba9f2e739 -s ours am: 4fe3a9d91a -s ours am: 1c7d7561df -s ours

am skip reason: Change-Id Ibd77c56ba5d1b395d478ba85263596032fa22144 with SHA-1 c6b7a9171d is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If43ff2c5ab185471cad63698d22e92fa2135a78f