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

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

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