Merge "Optionally use MdnsAdvertiser for advertising" am: 55bb102b2d

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

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