Android Mainline 12.0.0 Release 63 (7993649,com.google.android.networkstack)
[automerger skipped] Mark ab/7061308 as merged in stage. am: 9189101c2e -s ours am: ed5d07f754 -s ours am: 5ffe5cf5ba -s ours

am skip reason: Change-Id Idc6eea7089eb139029872414b517da7d22560d6b with SHA-1 2e7bd2403b is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I450838a24f7412243b8017a0f081404ffbfcb1ac