Android mainline 11.0.0 release 36
Snap for 7132927 from 5196998d016d78cdf2816f5aee3e6b143c7ab8a1 to mainline-captiveportallogin-release

Change-Id: If4878a37a686183501483fedd8bf0d9982a5e6c0