Merge "Add null check for mChannel object in WifiP2Settings" am: 2f4962c862

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

Change-Id: I34c53ca0500252de1245691e403327f470d0e293