[automerger skipped] Merge "[DO NOT MERGE][Wi-Fi] Fix fatal exception in...

[automerger skipped] Merge "[DO NOT MERGE][Wi-Fi] Fix fatal exception in WifiConnectionPreferenceController" into rvc-qpr-dev am: b576c802 am: 84ac3605 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2aa61916205da9cd781743c7ee37b246a92f621a