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

Change-Id: I31f74492d7e0e036b24f3f19a65d7eb688fc3703