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

Change-Id: I93d7fc02a5864fe450c1e02998bf7f6af737d6d4