Merge "[adb] Fix crash in mdns service removal." am: 7229923bcd am: d6fcfc8099 am: d1a2b264de

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

Change-Id: I0e0d61068d3e27353671d7066215178ebc78d2c0