Android mainline 12.0.0 release 6
Snap for 7550930 from 815f17b5c020e4931fa22619e5c7d1012be74837 to mainline-captiveportallogin-release

Change-Id: Id0e4d11589687a0113c3599d4cac351fa64c00a4