Merge "Fix broken testCaptivePortalApp" am: 5110c6dad6 am: 0fa2dde613

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

Change-Id: Iaebc7427cafaf77c025885f2ac317cbead21b068