Android mainline 12.0.0 release 6
Snap for 7550930 from 326aa670f812a052a94f1a7d3ae4266950f49ed1 to mainline-captiveportallogin-release

Change-Id: Ice596f736e33cad6aa9447dbb5282ad2ea131356