Merge "Enable DOM storage API for CaptivePortalLoginActivity" am: f7150486bf am: 7042e290cf
am: f27ea45a90

Change-Id: Ie07ab945aa6a5c997f776f237f757c533cc1d453