Android Mainline 12.0.0 Release 49 (7914710,com.google.android.networkstack)
[automerger skipped] Mark ab/7061308 as merged in stage. am: 1c202c87d7 -s ours am: 1ddd8b25e0 -s ours am: 0584a973d2 -s ours

am skip reason: Change-Id I790ce8d5e5e573ab896118d92c351bb43f42025c with SHA-1 500d7c41bb is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a28c512432ff703e0edf8824796045538006b22