Merge "[adb] Check for null in mdns connect info." am: cf88259783 am: 4f1c40957a

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1340738

Change-Id: I15b95626a658646b98ff628e3c05d56d7a29a930