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

Change-Id: I9990466d0cad4caf3020f5c3f1988a7088862fc7