Merge "Ensure service type ends with a dot in discovery" into udc-dev am: c789bd8ea4 am: 73f633b6ad

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

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