Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen...

Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241f am: ec1b6c30 am: c422d951 am: 9ed56d08

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



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