Merge "Add a version check in CaptivePortalLoginActivityTest" am: 3027354ca4

Original change: https://android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/1426647

Change-Id: I77dc5a326b509b17ef83965244d31bee19ee4204