Merge "Split POLICY_EVER_VALIDATED_NOT_AVOIDED_WHEN_BAD into two" am: 3b2907e449 am: 703c20adec am: d5ad8b9a20

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

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