Merge "Split POLICY_EVER_VALIDATED_NOT_AVOIDED_WHEN_BAD into two" am: 3b2907e449 am: 3a33336677

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

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