Android mainline 11.0.0 release 36
Snap for 7266504 from 3283ade0dddf5eadf29b047c5b657cd937338c00 to mainline-captiveportallogin-release

Change-Id: I01af2e481531a01a1c949ac90a1a5e22c43b5a4a