Merge "Fix CaptivePortalTest before R" am: 41dd05fdfb am: 547c982b97 am: fc71616a48

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cdd1dfce5a162c6e630bc6c95d99a08ff7f0169