[automerger skipped] Merge "Ensure service type ends with a dot in discovery" into udc-dev am: c789bd8ea4 -s ours

am skip reason: Merged-In I677ee885d1ee8e6a09773f21e4dd53e96faee748 with SHA-1 2f82fcdd6c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/23206477

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