[automerger skipped] Merge "Add MdnsServiceCache" into tm-mainline-prod am: 92a429fc5c -s ours

am skip reason: Merged-In If3d4eb4e3dc5455f6f97cb782aa1b99b2a00f6e0 with SHA-1 9d9ae4d2a1 is already in history

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

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