Merge "Enable useSessionIdToScheduleMdnsTask" am: 01b988255f am: 914651bd33 am: a4ea0d5a08

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

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