Android Mainline 12.0.0 Release 99 (8305796,com.google.android.captiveportallogin)
[automerger skipped] Mark ab/7061308 as merged in stage. am: aa41ff0074 -s ours am: 643b30239f -s ours am: 1f066f7861 -s ours

am skip reason: Change-Id I71d74c1f385f93f0a4c8bba0b033b7f762c3a57f with SHA-1 a4c9705ad2 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf6cc55ceda87395eca42a8558d2a009bf247276