Merge "Validate NetworkDeviceInfo is not null in HotspotNetwork" into udc-dev am: a37d81bf am: 4dbc8cf2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21931903



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