Android mainline 12.0.0 release 6
Snap for 7550930 from 979db8934bf0ae522e92f9b16d71c297b1edc0da to mainline-captiveportallogin-release

Change-Id: I1768896e2243d4cba2b58c012a644ea8b59b2a18