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

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

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