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

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

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