Merge "Enable the CONFIG_NAN_USD flag in the Vendor Supplicant AIDL layer." into main