Android Mainline 12.0.0 Release 59 (7993649,com.google.android.captiveportallogin)
[automerger skipped] Mark ab/7061308 as merged in stage. am: 9d99abd6fc -s ours am: b9d61f08e9 -s ours am: ea886e460b -s ours

am skip reason: Change-Id I2f321cb7a3f813b791c6707eb6cc2f320694ae9d with SHA-1 b3c413d2e2 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic6840728ef2392f9b8284507b9894c5d7ac5a569