[automerger skipped] Merge "adb: change mdns tls service names (RFC 6763)." into rvc-dev am: 0970bcf9 -s ours
am skip reason: Change-Id Ia872e976fc4276587b500a827a41d46d9dc755dd with SHA-1 81f2db4d is in history
Change-Id: Id7aab4a61c53f9d55f66f172f20dd84340ecfbdc