Merge "Explicitly select mdns_aidl_interface-V1-java" into main