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

Change-Id: I3f4b034ff3a03d7c1136ec6aaa826d4d1c14b610