Merge "Fix the problem of CaptivePortalLogin app cannot show SSL error page"
am: 1a80ff943d

Change-Id: Ief7b9c8f172fa3ad5a1143d998d455797c1bf937
tree: 62471a3e6fd48f0615e604ee316835002dc1f8f7
  1. assets/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS