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

Change-Id: I15a873b27f5eeb3ed712edcfbdabeae3b04cb983