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

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



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