Merge "Add mdns_improvement_for_25q2 aconfig flag" into main am: 2623db82 am: 3ca694e6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3408939



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