Merge changes from topic "MDns_AIDL" am: 09475308b7 am: cc0863b335

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

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