Android Mainline 12.0.0 Release 99 (8305796,com.google.android.captiveportallogin)
[automerger skipped] Mark ab/7061308 as merged in stage. am: f7aba1dbd4 -s ours am: df5b961a13 -s ours am: c2b92f2ff5 -s ours

am skip reason: Change-Id Id1a6c9479be842a834ac2dbc9ab5aa0d38ab2e79 with SHA-1 0da919dab3 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic84cb9c6d06fbad2e87c684c69b44a2b347911ab