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

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

Change-Id: I015c98915193a28d3b53b309b38479247346519b
tree: ffa92404e03bb72604d90b78330201da4bc6e376
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING