Merge "Fix CaptivePortalDataTest on R" am: fada307ddf am: 04dd0eb01a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib748e01e114866042996e61383151c2500fa8868