Merge "wifi: Move supplicant HIDL interfaces to subfolder"