Merge "Fix broken testCaptivePortalApp" am: 5110c6dad6

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

Change-Id: I7a77b050fd844f76e4f7aafa319017382ac06602
tree: bead5c1f9921ce915535ad484b87c4e24cdfce65
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING