Merge "Add API for NetworkStack to start captive portal" am: ca551ce981
am: 7f71f50ae6

Change-Id: Ie428acbfce0f94f0bade67258fefbb3253a539df