Merge "Fix broken testCaptivePortalApp" am: 5110c6dad6

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

Change-Id: I7a77b050fd844f76e4f7aafa319017382ac06602