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

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

Change-Id: I015c98915193a28d3b53b309b38479247346519b