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

Change-Id: Ibeb055f392e317d100d63425675008267bcf719e