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

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

Change-Id: Ie97da8acc7f25ae088d9ef36932aeb93be30b7cd