[automerger skipped] Merge "Check multiple security types for Wi-Fi...

[automerger skipped] Merge "Check multiple security types for Wi-Fi NetworkRequest" into tm-qpr-dev am: 47d87cb4 am: 2bd5b1c7 -s ours

am skip reason: Merged-In I8848ccd1cb0589284a48ddaa77591f5bf3b41932 with SHA-1 a88c0648 is already in history

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



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