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

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

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