[automerger skipped] Merge "Revert "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib"" into rvc-qpr-dev am: bd86a39c7d am: f420f94e7d -s ours am: fc51452b25 -s ours
am skip reason: Change-Id Id4901d632f7f4634461ebbbc096e36d348a33365 with SHA-1 fef7216ef9 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12193284
Change-Id: I9f2fd3fba50743931b6c29dcb20ad8ba8942f29c
This commit is contained in: