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

Change-Id: I8f46698b23118213019226e4b9d5e6b196b010d3