Merge "Fix CaptivePortalTest before R" am: 73e63132a6 am: a2229ce85b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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