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

Change-Id: Ie9e2e728d903814d9f46c97c8741f64096a112e6