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

* commit '00c64f7ca5b05384dc3c208eff43e0b1a037a7d0':
  Add android.net.CaptivePortal class for captive-portal-handling-app callbacks