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

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

Change-Id: Id4c47e039124a66231b7db534b4fb02e9de212fe