Merge "Add API for NetworkStack to start captive portal"
am: 26b11cdf44

Change-Id: I72166f14ec4f7589a1dbd0334de37530ebccf88e