Merge changes from topic "MDns_AIDL" am: 09475308b7

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

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