Merge changes from topic "mdns-ttl" into main am: 0520e26936

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

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