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

Change-Id: I31191e6a615531453bda34c6098a876e5036da99