Merge "Move mdns package to the right directory" am: 29189a51c0 am: fd83f46746

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

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