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

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

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