Merge "Fix CaptivePortalDataTest on R" am: 32dbde1641 am: 24f7848d23 am: e753cb6d5b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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