[automerger skipped] Merge "[Wi-Fi] Remove 'Do not validate' option in CA...

[automerger skipped] Merge "[Wi-Fi] Remove 'Do not validate' option in CA certificate spinner" into rvc-qpr-dev am: 5d86bebb am: 67589488 -s ours

am skip reason: Change-Id Icf97199967faa2e359b0120a8c989bd1df2c6cea with SHA-1 21faffa2 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12271448

Change-Id: I0f81e538d00f7e26b0dedb2cc1faeec223c017d3