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

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

Change-Id: Iff09544961cd7d97d64bab42ca2921acb4d57dab