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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cdd1dfce5a162c6e630bc6c95d99a08ff7f0169
tree: 1e18ea378a419420e152ad9ec359afd908dd73a5
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS