Merge "Fix WifiDialogActivityTest legacy issue" into main