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

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

Change-Id: I752dd049db0d9863c6ab1430945b2915146d9bcb