Merge "Check P2P channel before requesting network info" into udc-qpr-dev am:...

Merge "Check P2P channel before requesting network info" into udc-qpr-dev am: dc98948c am: fedd6b35

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



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