Android Mainline 12.0.0 Release 63 (7993649,com.google.android.networkstack)
[automerger skipped] Mark ab/7061308 as merged in stage. am: 328f054062 -s ours am: b5e84d4671 -s ours am: 3c45c014e4 -s ours

am skip reason: Change-Id Ib12f54a8e53486de8fc7287dd04324b3a13b563d with SHA-1 351b689ef6 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I69dcd3f84a9aa61a0be0715b228eeca69b1775f8