Android Mainline 12.0.0 Release 63 (7993649,com.google.android.networkstack)
[automerger skipped] Mark ab/7061308 as merged in stage. am: 4e2b8fdb44 -s ours am: 5859ce9381 -s ours am: c8ff1f4cd4 -s ours

am skip reason: Change-Id I6137057e05c9c99cba2e4c699d5e702e24e0dbd6 with SHA-1 26ba5ac7b3 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ba9a5bfa99d1bda9f73e40092e4a3f284bdda3c