Merge "Remove DISMISS_PORTAL_IN_VALIDATED_NETWORK variable" am: d3658eca4c

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

Change-Id: I1527077f906e2091d9cf1499fe05bbdfb3768dcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>