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

Change-Id: Ic9c3111006a074a8fc2a4a2800fc210f14a9f7d4