Merge "Settings: Fix WifiSettings FC when rotating screen" am: f558fc27 am:...

Merge "Settings: Fix WifiSettings FC when rotating screen" am: f558fc27 am: 3531a347 am: caa0bbd9 am: 4440e7a0

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



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