Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev