Merge changes from topic "mdns-ttl" into main am: 0520e269 am: 8c132798

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



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