Merge "Fix broken testCaptivePortalApp" am: 47f5317b65 am: 5001e88f0e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659999

Change-Id: Iaebc7427cafaf77c025885f2ac317cbead21b068