Merge "Keep case in MdnsServiceInfo attributes" am: 2172a5a370 am: 2622e5045f

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

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