Merge "Add MdnsServiceCache" am: 336121d021

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

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