Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6
am: ec1b6c308a
am: c422d95147
am: 9ed56d081c
am: 32ebc2afd9
am: ce7f56de67
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236 Change-Id: I6d5fa9e521b164049a5c42ba0c502b232e1ca7cc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: