Merge "Enable DOM storage API for CaptivePortalLoginActivity"
am: f7150486bf

Change-Id: Ie6e99f0c8ddeb28086197b291c198fa115f6e157