Merge "Split POLICY_EVER_VALIDATED_NOT_AVOIDED_WHEN_BAD into two" am: 3b2907e449

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

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