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

Change-Id: I8253a3df0ef7fdf421e8a05e7a62fd1e4fa1a700