Merge "Add startCaptivePortalApp to system API"