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

Change-Id: I09376591728ecb051270770bd7296e209374dd45