Merge "Keep case in MdnsServiceInfo attributes" am: 2172a5a370 am: 78ff0b4423

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

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